main: grab the keyboard D-Bus interface at startup

https://bugzilla.gnome.org/show_bug.cgi?id=658065

diff --git a/js/ui/keyboard.js b/js/ui/keyboard.js
index e6d56b7cec045e766dd07f071a7f42d127741adf..7742788b94680e2e23bb064ad09fa188d90cc333 100644 (file)
--- a/js/ui/keyboard.js
+++ b/js/ui/keyboard.js
@@ -199,7 +199,6 @@ function Keyboard() {
 Keyboard.prototype = {
     _init: function () {
         DBus.session.exportObject('/org/gnome/Caribou/Keyboard', this);
-        DBus.session.acquire_name('org.gnome.Caribou.Keyboard', 0, null, null);
 
         this._timestamp = global.get_current_time();
         this.actor = new St.BoxLayout({ name: 'keyboard', vertical: true, reactive: true });

diff --git a/src/main.c b/src/main.c
index 23c33a52adc6d954bbad2a043b77e8878e872aaf..7c68799e65c2ddfeee3ac252d015f2aba6a5244f 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -117,6 +117,17 @@ shell_dbus_init (gboolean replace)
       g_print ("failed to acquire org.freedesktop.Notifications: %s\n", error->message);
     }
 
+  /* ...and the on-screen keyboard service */
+  if (!dbus_g_proxy_call (bus, "RequestName", &error,
+                          G_TYPE_STRING, "org.gnome.Caribou.Keyboard",
+                          G_TYPE_UINT, DBUS_NAME_FLAG_REPLACE_EXISTING | request_name_flags,
+                          G_TYPE_INVALID,
+                          G_TYPE_UINT, &request_name_result,
+                          G_TYPE_INVALID))
+    {
+      g_print ("failed to acquire org.freedesktop.Notifications: %s\n", error->message);
+    }
+
   g_object_unref (bus);
 }